bpf: refactor max_depth computation in bpf_get_stack() #5884
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
Upstream branch: c9110e6 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
0e26bd3 to
4e70ac0
Compare
Author
|
Upstream branch: abc8a95 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/998624=>bpf-next
branch
from
59e987e to
dbecee5
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
4e70ac0 to
c04dd5a
Compare
Author
|
Upstream branch: 929adf8 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/998624=>bpf-next
branch
from
dbecee5 to
f537268
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
c04dd5a to
4754b79
Compare
Author
|
Upstream branch: 2d92ef7 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/998624=>bpf-next
branch
from
f537268 to
d4b1d24
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
4754b79 to
af15c58
Compare
Author
|
Upstream branch: b338cf8 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/998624=>bpf-next
branch
from
d4b1d24 to
3dd1f00
Compare
Author
|
Upstream branch: b338cf8 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/998624=>bpf-next
branch
from
3dd1f00 to
b1c68e4
Compare
Author
|
Upstream branch: b338cf8 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/998624=>bpf-next
branch
from
b1c68e4 to
6f6cbad
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
af15c58 to
c979e9f
Compare
A new helper function stack_map_calculate_max_depth() that computes the max depth for a stackmap. Changes in v2: - Removed the checking 'map_size % map_elem_size' from stack_map_calculate_max_depth - Changed stack_map_calculate_max_depth params name to be more generic Changes in v3: - Changed map size param to size in max depth helper Changes in v4: - Fixed indentation in max depth helper for args Changes in v5: - Bound back trace_nr to num_elem in __bpf_get_stack - Make a copy of sysctl_perf_event_max_stack in stack_map_calculate_max_depth Changes in v6: - Restrained max_depth computation only when required - Additional cleanup from Song in __bpf_get_stack Changes in v7: - Removed additional cleanup from v6 Link to v6: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Arnaud Lecomte <[email protected]> Acked-by: Yonghong Song <[email protected]> Acked-by: Song Liu <[email protected]>
Clean-up bounds checking for trace->nr in __bpf_get_stack by limiting it only to max_depth. Signed-off-by: Arnaud Lecomte <[email protected]> Cc: Song Lui <[email protected]> Acked-by: Song Liu <[email protected]>
Syzkaller reported a KASAN slab-out-of-bounds write in __bpf_get_stackid() when copying stack trace data. The issue occurs when the perf trace contains more stack entries than the stack map bucket can hold, leading to an out-of-bounds write in the bucket's data array. Changes in v2: - Fixed max_depth names across get stack id Changes in v4: - Removed unnecessary empty line in __bpf_get_stackid Changs in v6: - Added back trace_len computation in __bpf_get_stackid Link to v6: https://lore.kernel.org/all/[email protected]/ Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=c9b724fbb41cf2538b7b Fixes: ee2a098 ("bpf: Adjust BPF stack helper functions to accommodate skip > 0") Signed-off-by: Arnaud Lecomte <[email protected]> Acked-by: Yonghong Song <[email protected]> Acked-by: Yonghong Song <[email protected]>
Author
|
Upstream branch: 9621eb6 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/998624=>bpf-next
branch
from
6f6cbad to
4d4e299
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: bpf: refactor max_depth computation in bpf_get_stack()
version: 7
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=998624